Merge commit 'refs/changes/42/2374342/1' of sso://googleplex-android/platform/packages/apps/Launcher3 into dots-color

Change-Id: I85d3d443fcdc4f738da7040178eaab01dd881856
7 files changed