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

Change-Id: Idea7a9c3217661f1b570dbd835dfe85ea2f00cb0