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

Change-Id: I85dc9f76f21ebbe156ef68bcb5a11c28c8d871ba
7 files changed