3970b8b797
Test: manual, presubmit on the source branch http://x20/teams/android-launcher/merge/ub-launcher3-master_6155931.html Change-Id: I2083903dafc81c9b35437054be6a42a0612f0749