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

Change-Id: Ibf9bb3985ef61714040f6d1bc90ac0094aa432a4