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

Change-Id: I5c8729c570a384623a9a89d1962f5a6bf87789f9