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

Bug: 113683301
Test: make -j31
Change-Id: I8cbe661a13f2b9ef2ea84bb52a56fc658836ab14