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