Issue:#4239 Issue:#4254 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=196796569
