6b9595f607
Test: manual, presubmit on the source branch http://x20/teams/android-launcher/merge/ub-launcher3-master_6150369.html Change-Id: Ia79497c0a9f03cf6ad9e9daa58ed34c02a36e879