Merge "Don't show unset values in AccessPoint toString." into oc-dev