Merging from ub-launcher3-rvc-dev @ build 6511067 am: 41dc164d11 am: 3ec5c4970c

Change-Id: I5ac68dd50e0ee10b014461ae1f5220eccc953961