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

Change-Id: Idc55667e44750ec6b44f21d95dd9056b3f224c81