am 04bb7a9a: am c76683f5: Merge "Check that width and height parameters are small."

* commit '04bb7a9a4195de14e11e2ea9a9439b9e43e9f660':
  Check that width and height parameters are small.