Merge "Fix a few annotation nits from ag/27086435" into main