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

Change-Id: I71fb70dd624b2ab69bb73efea48e5367642a799d