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

Change-Id: Ib5fca7d359c81058ee950d51f5f7fdd166842f33