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

Change-Id: I87ac4893c28360bba7cb088bfaaa652619196bfc