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

Change-Id: Ib7d3a2fa25c3556588e06a2c32cc0cc9ec188a6c