Merge "Nit cleanup: Update TileLayout.onLayout" into pi-dev am: 71120e1b20
am: 63c26b1d95

Change-Id: I24fb8e60ec8b96ec63e5062a2cafa7caefe76b1e