Merge branch 'ub-launcher3-master' into launcher3merge2018-12-07

Test: Presubmit
Change-Id: I063ecf5b4373af34d24b4af444811a5d17198cf5