Merge "Fix to set audio mode for SIP call" into oc-dr1-dev