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

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