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

Change-Id: Ib5b15b1b5c4a115c4052eca9ef65638f0c0e1eda