Address review comments.

1 job for 317863-fix-map-inner-class-name in 9 minutes and 25 seconds (queued for 10 seconds)