Merge "Change to preserve user/carrer added/edited APNs on upgrade." into mnc-dev