Merging from ub-launcher3-rvc-dev @ build 6436292 am: 82902c0da6 am: afdae84544 am: 0b2e2aec60 am: 731943e045

Change-Id: Ia4f765487ec506a0c11bd940f8268d828a95661b