[DO NOT MERGE] Copy of 2364

[jambayk]

Describe your changes

Checklist before requesting a review

• Add unit tests for this change.
• Make sure all tests can pass.
• Update documents if necessary.
• Lint and apply fixes to your code by running lintrunner -a
• Is this a user-facing change? If yes, give a description of this change to be included in the release notes.

(Optional) Issue link

[jambayk]

/azp run

[azure-pipelines]

Azure Pipelines successfully started running 1 pipeline(s).