Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 8249b928b7 am: 896dd9a122
am: 57622d0578

Change-Id: I923238f0f846368db002cfb1614473ab7b0956c1