fix xss vulnerabilities
bug: 15597152
bug: 15405607

Change-Id: I10582d5cd767b977fc2af0f2cf2642802feeffab
1 file changed