Merge "HFP 1.7 profile update (2/4)"