Merge "AccessPoint - Add Builder; Add unit tests for compareTo()"