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

Change-Id: I0171418c05d7bcc4d8af61ef3958224593851200