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

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