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

Change-Id: Ic4f78c6be4ef986a9d2739a765167b6595a64b04