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