Merge "Annotate APIs with appropriate flags" into main