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

Change-Id: I393eb4bf6f8429368769133517a6565e32a91b99