Merge "Hide mistakenly exposed system typedef annotations" into main