Merge "Change AccessPointPreference key generation to match AccessPoint." into oc-mr1-dev