Merge "Merge branch 'ub-launcher3-dorval-polish2'" into oc-mr1-dev am: fb46415e80
am: 40f806ef53

Change-Id: I10b31a87f837d8c20e7ec26173021383d19222a4