Merging from ub-launcher3-rvc-dev @ build 6538292 am: d67be77066 am: 2deb21875d

Change-Id: Id9a53d8a681e4d9260868fe03b8587b58b40a21a