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

Change-Id: I0ac3009fa219937ea06ac5775b69070c959f6940