Merge commit 'edefe53f8b5ccc2339bec2d8fd9c7516aeb2d319' into remote

Conflicts:
	include/hardware/bt_hf.h

Change-Id: I46d7cf89a27ecc905edf2005839876b9971abf99