Merge "Add a missing check for null pointer during closing of PBAP Service" into oc-dev