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

Change-Id: I6af388d4bf7c0c36ac928ff50b280eb2a75680ff