Merge branch 'ub-launcher3-dorval' into launcher3merge am: 7e0801eafb
am: 6df10a64d2

Change-Id: I4d922182ef9307b2d93b4120c425413a73285632