Merge branch \\'ub-launcher3-burnaby-nyc\\' into nyc-dev b/29535844 am: 3c0c2c4b02 am: 8868238fb2 am: 7cd14d0e55 am: db0d2d6122
am: 2088be1fef

Change-Id: If08811aca6ec45cf4fbc15871a969b53e5a3b302