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