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

Change-Id: Ia2e6a6cf4c84fbb0ecae615c7e91b43e3d0bf50e