* Remove deprecated LibrarySort * Apply suggestions from code review (cherry picked from commit 58acf0a8aa3aa37b5d9c63d99987a05ee2f8790f)
* Remove deprecated LibrarySort * Apply suggestions from code review (cherry picked from commit 58acf0a8aa3aa37b5d9c63d99987a05ee2f8790f)