Merging from ub-launcher3-rvc-dev @ build 6436292 am: 82902c0da6 am: a43f9d93fb

Change-Id: Id58120721b1ec1947a284ee11c2c8a28fa2a872a