Fixes for other places where we expect CellLayoutChildren instead of CellLayout. (3392097)

Change-Id: I9df13c413ce62a2760ce6a8ebafed1e948088de2
3 files changed