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

Change-Id: I3288fef64f6019de71dfb28f670f868a24a4ab0b