Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 908298f567 am: 2aca1b1820 am: 8fd416a7be
am: df304a67ec

Change-Id: I08ca9a1e217d31c1b8bbf2bd1ccf94a7d155ad50