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