54334661e4
Test: manual, presubmit on the source branch http://x20/teams/android-launcher/merge/ub-launcher3-master_6075050.html Change-Id: Iefe48be1562428d98ebf08c5f68a01856dbefad2