Merge "HFP 1.7 profile update (2/4)"
am: 2ffbffae64

Change-Id: I7ac2f06b085c497f1cd26acb1cc20c5372737331