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