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