This change has already been made in google's repo.
Replicating the change here to unblock work on genproto.