am 8f327e49: am 6e314086: Fixes for other places where we expect CellLayoutChildren instead of CellLayout. (3392097)

* commit '8f327e49dea449878d1d8c1e5295bbbefe64b77a':
  Fixes for other places where we expect CellLayoutChildren instead of CellLayout. (3392097)