Merging from ub-launcher3-rvc-dev @ build 6538292 am: d67be77066

Change-Id: Ibbedc831d13ae87ab94aa110aef85777e70abb34