Merge branch 'ub-launcher3-dorval-polish2' into 1003 am: a328a0d83a
am: 1df303950e

Change-Id: I3a94e6fbf5cfe4fd75d257cfe08e72bdb47acde7