Merge "Move generatePreferenceKey to AccessPointPreference." into oc-dr1-dev