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

Change-Id: I9cd2fa3419fdc69bb6970a2951edcca2fd466e8f