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

Change-Id: Idab5453fb384bef7dcbaf5b0beede516420ef77a