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

Change-Id: If9a9db9effb6dcd3bd8947200b7216d96c0c2884