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