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

Change-Id: I3ca354a01a91559db39aee7bb9eb1a11035f58bc