am 599f9154: am aaf4c41e: DO NOT MERGE Fix externally reported security vulnerability.

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