Merging from ub-launcher3-rvc-dev @ build 6469858 am: fe68c9eec1 am: 35f5ad1768

Change-Id: I477797f127f23e8f9b27532f8e11f874f67de4cf