Merge branch 'ub-launcher3-master' into launcher3merge2018-11-01

Test: will rely on presubmit
Change-Id: I78bf3148f34df9ab46ae96a780c70e2bafe7fa44