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