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

Change-Id: I5e7871f81ad9eda61c134cdaa4b5257fa80cdfd1