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

Change-Id: I3dd1b0998f66dab5221f456f23ce8daf11ed0627