Merging from ub-launcher3-rvc-dev @ build 6469858 am: fe68c9eec1 am: dab51b766e

Change-Id: Ibd7f08f52c846c218f85d5fa157de4249592231b