Merging from ub-launcher3-rvc-dev @ build 6538292 am: d67be77066

Change-Id: Ib1c28fe1a14e0307ccaad8a930c1aa1a1c1c3b81