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

Change-Id: I0f7581589e52da91515527f1d325680a6f8e74a9