Merge "Remove security vulnerabilities in runtime-api"