Merge "Fix some apn settings issues." into jb-dev