Fix getter in Builder class if the corresponding getter was changed.

Fix getter in Builder class if the corresponding getter was changed. #6580