Merge "Remove unused lambda captures" am: 1101f45613
am: c7ce115073

Change-Id: I284275ea9abc1eb1d6655372ddd27f9cb2eef4ab