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