Merge "Update dependencies for security vulnerabilities"