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

Change-Id: I0a5e6e16d2cecc7151d1a863c8e8e07fb83ea060