Merge branch \\'ub-launcher3-burnaby-nyc\\' into nyc-dev b/29535844 am: 3c0c2c4b02
am: 027594fc1b

Change-Id: Ic10773833d1aac1a94bb5af58c7a6f92c815bfd6