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