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

* commit '95f3f0296be2842948f0c0262a067e69dcd77f6f':
  fix xss vulnerabilities bug: 15597152 bug: 15405607