Merge branch 'ub-launcher3-master' into launcher3merge2018-08-31

Bug: 113683301
Test: hopefully it builds
Change-Id: I6932ffab84fefeb134990a8d6bd91d114039448b