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

* commit '787bdb33f6cdffd810dd243eedfbc0aed2c0abed':
  Fix Externally reported security issue