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

Change-Id: Ia6be79352d96e6edcef08654a71adc485f845c33