Merge "Revert "Work around bugprone-exception-escape bug.""
am: 2f4af84489

Change-Id: I9f8e574bc10c7c669ead2193f8c2ef10d5005271