Merge "Make ProfileNetworkPreferenceList generic"