Merge "Check null of pidPair to skip the case the service record has been removed" into ics-factoryrom