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

Change-Id: I3a07802a21b3af9c3dea9afac78083011eda1d47