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