Merging from ub-launcher3-rvc-dev @ build 6436292 am: 82902c0da6 am: afdae84544 am: 130cd74716

Change-Id: I52dc7811165818212edc0688e0e273b1069d9624