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

Change-Id: I78c3b855c5c213c3ba89288f6d0f8a1a61c263d3