Merge branch 'ub-launcher3-burnaby-nyc' into nyc-dev
b/29535844

Change-Id: I46d6f461261a4a8ba8bcea58ac82e005fca35109