Merging from ub-launcher3-rvc-dev @ build 6469858 am: fe68c9eec1 am: dab51b766e am: f9f159714e am: b87ddc5c5b

Change-Id: I1de06364d194ae6cdd0f25658082a74c2e583ff2