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

Change-Id: I5004c77f118b48947607dbac2a89db95258f88a6