Address code review comments.

1 job for 317929-remap-annotation-attribute-names in 8 minutes and 1 second (queued for 25 seconds)