Merge "Merge branch \'ub-launcher3-burnaby-nyc\' into launcher3merge am: 8c340dff19 am: 8249b928b7" into nyc-mr1-dev-plus-aosp am: 3a40216fa0 am: e878f1c719
am: b9ef562e93

Change-Id: Idd9a42eb247b0e4b197cc87a18efe58dff9ec2bd