Merge commit 'refs/changes/16/2352216/4' of sso://googleplex-android/platform/packages/apps/Launcher3 into am-703609c5-a335-4a37-9002-1680d054b324

Change-Id: I5db0565024786f6476821f11954f30538a7a4cdc