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

Test: none
Change-Id: I8dce25b79bf67c9af06ed362fc4153c711e8f788