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

Change-Id: I89fd67f83192a8529e8945b3c81ce39393ed5d0f