[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

Change-Id: I319ea9a78307bb36e157d16254f8f13c64e43202