Merge "Handle null ApnSetting in PDCS" into tm-dev