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

Change-Id: Ie8649cdb464e0577dc5f31b6b22a00fad225c40b