Merge "Handle null ApnSetting in PDCS"