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