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

Test: Presubmit
Change-Id: Ibec2771e9b4e5a81dc618bc0f6951ba52aed6801