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

Test: Presubmit
Change-Id: I6127a17d944d5d5dde0265d2b4154230e035ed60