am 695b7229: am 558f1c2a: Fix NPE in CellLayout (issue 11113502)

* commit '695b722928a61b5cc7c7426590821114bd50eed4':
  Fix NPE in CellLayout (issue 11113502)