am 332bdb16: (-s ours) am 8b73003f: am ea288fd3: Merge "Fix WallpaperCropper crash when setting wallpaper over 8MB"

* commit '332bdb16277c5bc65e75274e18ee2656283f0a27':