Merge branch 'ub-launcher3-dorval-polish2' am: 850a7b1030
am: a420855e0b

Change-Id: I8ca2beefe89affd4796794b5dea101832798a39d