Make sure we rethrow the same exception we started with.

Bug: 6312938
Change-Id: I41d8adf27fd32103c55d9eeafa28a25c37f5029d
1 file changed