Merge "HFPClient unhold conference call" into oc-mr1-dev