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

Change-Id: I4a7de539c323b1e6064e53186a0b4e90b8bfa096