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

Change-Id: I352dd813b2283d0f4bb6779dc8e0aa0093b80a00