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