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

Change-Id: Ia34c42606845af394a3fe54ad09045fd10c883b2