Merging from ub-launcher3-rvc-dev @ build 6436292 am: 82902c0da6

Change-Id: Ifa733f80c0e9d6d22b7bb6179741ec7a56d83f55