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

* commit '7d0bf002a4c849fb13e0893129874db970551e93':
  IMS: SRVCC related fixes.