am cc880748: Merge "IMS: SRVCC related fixes." into lmp-mr1-dev automerge: 7d0bf00 automerge: 8152903

* commit 'cc8807487a6ab4c75630a7d5415f1bbc2db37fde':
  IMS: SRVCC related fixes.