Merge "HFP 1.7 profile update (3/4)" am: f28f6bb2b0
am: a095ee3c1d

Change-Id: I31570d1d9da08e6d7481ffead5ef7625c88018f2