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

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