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

Change-Id: I6af9bb3d82d76ddc1db4b33b5e9584e7150c0f2c