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

Change-Id: I7b86114d0485b73251f4460511db89c9621dfd37