[automerger skipped] Merge "DO NOT MERGE Validate wallpaper dimension while generating crop" into oc-dev am: 17fd658061 am: 9c9c1c0f8a am: 7c50686c92 -s ours am: a234d64df2 -s ours am: 76e1059b1a am: 0eef3050da am: 55058c3d01
am: 9d627e9a87 -s ours
am skip reason: subject contains skip directive

Change-Id: I2c227c4c496a6a66788dc091cf467d5985254e6b