Merge "Revert "Workaround for Clang emitting spurious Wunused-lambda-capture warning""
am: 61a7b9f0fe

Change-Id: I1db8899fd0388579dcbcbf1e1aaaecb6630d62cc