Merging from ub-launcher3-rvc-dev @ build 6469858 am: fe68c9eec1 am: 35f5ad1768 am: 930a6bef3f

Change-Id: Icf3a1c9de7b4955cbfbdcbb54ff932358b98805c