Merge "Use Better Exception handling in IMS APIs" am: 4d324ee54e
am: 0b5ba8eaff

Change-Id: Id4a8b8d17c8afbf66fbd7858be20591de41cbba3