Merge changes from topic 'ims-handover-api' into oc-dr1-dev am: e15da2649b
am: 0d14298f80

Change-Id: Ic21cc388f95e04d47ef93f522412bccfce49d58e