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