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