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