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

* commit '64e2e14d3de997330652139d600888c3357f3028':