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

Change-Id: I58a59876308a00c55f7c705576162a9ca5cdd19e