Merging from ub-launcher3-rvc-dev @ build 6469858 am: fe68c9eec1 am: dab51b766e am: 36c83f49c7 am: 57ca886825

Change-Id: Ia889c0aef2222097331117bda308fe944cd2a027