Merge "Remove unused lambda captures" am: 5b8a92af5d
am: 26f71e6a5a

Change-Id: I0efa39264550dd7b8b741e788729fefc3de427fb