Issue: #4030 Issue: #4280 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=208055792
