Merging from ub-launcher3-rvc-dev @ build 6418896 am: df280add9e am: 3aa30d3d33 am: d69b63289b am: faf0d494e4

Change-Id: I58bc9692fe66b4461aa67eec532ca93a4d0a1726