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