This change also paves the way for splitting out functionality into a utility class. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=221070262
