Merge "Use better Exception handling in IMS APIs."
am: 1d8df63744

Change-Id: I4286dd818c02215440072d0ccadd58ff32d49fb2