Merge "Workaround for Clang emitting spurious Wunused-lambda-capture warning"
am: 5a6046f0b7

Change-Id: I0011b262b42321f283d6a32eba3dfb8b1aea5bb1