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

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