Merge "Ignore the result of user deleted APN" am: 33d7e887d3 am: 7952993b45
am: 767f16f483

Change-Id: I3279710502d318ecb868b756e1e415855d0c9ccb