Merging from ub-launcher3-rvc-dev @ build 6492476 am: 6e0d05fc41 am: a668e4b4e3

Change-Id: Ide35e42c602dc04b762fc07ecaa9c11424552b93