Merge branch 'ub-launcher3-master' into launcher3merge2018-10-29

Test: Presubmit
Change-Id: Ib885ad03c7612747672ca1b2f4b1ea38910fdabc