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

Change-Id: I7c279031e0a49eec33d108768d698873e5f9b9c0