am ecdbbafa: (-s ours) am 470ec031: am 599f9154: am aaf4c41e: DO NOT MERGE Fix externally reported security vulnerability.

* commit 'ecdbbafa702b78cfbbf88c7b06279f79182da304':
  DO NOT MERGE Fix externally reported security vulnerability.