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