Merge branch 'ub-launcher3-master' into launcher3merge2018-09-24

Test: will rely on presubmit
Change-Id: Id39959723c25e7e964ca85fd8b69692d554d157a