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

Change-Id: I3ccf8918a212d3248bd5c77cbdfbc0e8ebcb1536