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

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