Merge pull request #31541 from surajshetty3416/update-library-usage