am 4039488e: am 70f3528c: am 8b0a1bbd: Merge "DO NOT MERGE Double-check SIP state before issuing a swap-calls command." into mnc-dr-dev

* commit '4039488ef1de5be6a63b9111839f61d8b4d509e7':
  DO NOT MERGE Double-check SIP state before issuing a swap-calls command.