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

Change-Id: I9f8224581f72a0001d30019d8fc072ba57b3c927