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