Issue: #4262 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=197126757
