Merge "API: Avoid duplicate IDs in API documentation"