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