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

Change-Id: Idb7554a2c1e34354ad6a5308b1e315db76e1bc39