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

Change-Id: I61b4edceb7f22407570b16dd0cc27197d701a324