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

Change-Id: I2e1b96f4d3cde3b5657ba39304a1144889dc4114