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