Merging from ub-launcher3-rvc-dev @ build 6492476 am: 6e0d05fc41 am: 3cc9e2dcc1

Change-Id: I5338ccb41995048c92f2ea767e233e186b9040fe