Merging from ub-launcher3-rvc-dev @ build 6492476 am: 6e0d05fc41

Change-Id: I716c478823391f08a39f5cf011250fe81bc449cd