Dont try and do sane things, like generalizing specific exceptions

Bug: 59642
Change-Id: I52b4c8714150d32b51ee64748ab74437b113aac0
Merge "Dont try and do sane things, like generalizing specific exceptions"