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

Change-Id: I33a8cb72ea5010cfc629d7014bff76e703ff445d