* stable-2.15: Rebase: Don't swallow caught exception Change-Id: I9d4cd56d6b4a7e2ec612e4e401b77b8e1bf73b99