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

Change-Id: I9f01b361a2d029155c4812d36188adb49fa77ffd