ISSUE: #1681 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=128071668
