Merging from ub-launcher3-master @ build 6327709

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-dev_6327709.html

Change-Id: I75c5469b88d72fefcf59f487e5dcd70857323c16