Merge commit 'c21fb4624f8e5bb321ea48165a08b03be07f265e' of sso://googleplex-android/platform/packages/apps/WallpaperPicker2 into HEAD
Change-Id: I15fa1e302a3ad821cb709524098a22f99e5aad05