Feature/cherry pick overwritten commit after 2.10.0 update

[mcuxsusan]

Prerequisites

• [X] I have checked latest main branch and the issue still exists.
• [X] I did not see it is stated as known-issue in release notes.
• [ ] No similar GitHub issue is related to this change.
• [ ] My code follows the commit guidelines of this project.
• [ ] I have performed a self-review of my own code.
• [ ] My changes generate no new warnings.
• [ ] I have added tests that prove my fix is effective or that my feature works.

Describe the pull request

Cherry-pick the losing commits after MCUX_2.10.0 update merge back to main.

Fixes # (issue)

Type of change (please delete options that are not relevant):

• [X] Bug fix (non-breaking change which fixes an issue)
• [ ] New feature (non-breaking change which adds functionality)
• [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
• [ ] This change requires a documentation update

Tests

• Test configuration (please complete the following information):
  • Hardware setting:
  • Toolchain:
  • Test Tool preparation:
  • Any other dependencies:
• Test executed Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce.
  • [ ] Build Test
  • [ ] Run Test