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

Change-Id: I3c5bf0a79aca97e7385ec6d066d1f93069ccfea5