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