Merge "Add case sensitive sort to AccessPoint compareTo." into oc-dr1-dev