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