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