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

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