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

Change-Id: Ibf6c66017f81d423907ed3312f62f82c898aefaa