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

Change-Id: I67f85e04079edd8f24bd885f5ba0ef1569e6c2d7