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