am 3b77ab5a: fix xss vulnerabilities bug: 15597152 bug: 15405607

* commit '3b77ab5a01f1c3297bed32d9c7fac68a61bf3d20':
  fix xss vulnerabilities bug: 15597152 bug: 15405607