Merge "Remove unused lambda captures"
am: 5b8a92af5d

Change-Id: I3630eb3c17ac328c63a8675eb83893edcd196fb8