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