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

Change-Id: Ib44df9a8fc03058007f2a9f4be3798622ddb7760