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