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

Change-Id: Ifedf9f47e19538d35780e89b2f0c8487da97c2dd