Merge "fix duplicate api_extensions"