Bug: 19171297 Test: make, make calls, HFP regression Change-Id: Id1d44e07a939d121ccf05466239d3cb5cc4b3199