am 10fad6ad: am 787bdb33: Merge "Fix Externally reported security issue"

* commit '10fad6adce755808a21c02e1c4b94df7bf84e8b1':
  Fix Externally reported security issue