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

Change-Id: I141fba1ee7e0e79b5a04674cab6d789dc7e956ce