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

Change-Id: Idf42b577087bd88ddcc3ba5f4879a92649306ad7