Merge "Add a missing check for null pointer during closing of PBAP Service"...
Merge "Add a missing check for null pointer during closing of PBAP Service" into oc-dev am: 204c26d0 am: 49ba59f8
am: a63d213d
Change-Id: I7127a738d50a4507a9070e12cae42c10e1deac9f