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