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

* commit '81529032254a57a24f8aeddf06b5824001e11abe':
  IMS: SRVCC related fixes.