Merging from ub-launcher3-rvc-dev @ build 6418896 am: df280add9e am: adee7b2e87 am: c33084d36e

Change-Id: I2e4a2de614193a7656d3bb9180ad6c7af9e2d0a4