am 6641570e: am 17e1aeac: Merge "Fix CellLayout UNSPECIFIED exception (issue 11627191)" into jb-ub-now-jolly-elf

* commit '6641570ec10c95cfbaef139310c150626e035032':
  Fix CellLayout UNSPECIFIED exception (issue 11627191)