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

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