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

Test: builds
Change-Id: Iebb7cb6f79afa98e1ce0ef87461da5bc638af36c