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