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

Change-Id: I08f7db7d282da0ad3cd39e7501a57f045b0c1290