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