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

Change-Id: I174d73c8b78b602b1b15c315ee0faf537ebefca6