Merge "HFP Client Permission" into nyc-dev