Merge "Restore compareTo behavior of access point list"