Merge "Remove unused lambda captures"
am: 1101f45613

Change-Id: I371bd344d87a213393787a528121308c96c12d83