Merge "XSS Vulnerability fix in AuxApiRequestMapperController"