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

Change-Id: I478bf64e645d189e29086a3f13af7eec60dbc194