Merge "PBAP client Settings profile." into nyc-dev