Merge "IMS-VT: Fix exception caused by incorrect conversion" am: 68de30a2db am: e860a630f5
am: ba74484c21

Change-Id: I56c1002813af27897cbc68578096574dcc810d04