Merge "Suppress -Wunused-lambda-capture" am: dc5ce476fd
am: f13fcc45d4

Change-Id: Ied7bb0287da1fe3ecf86c52004678db9284e6061