Merge "Fix crash in ApnSettings." into nyc-dev