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

Change-Id: If7f5f91ee182426dc01fb671ecbee374c350f0b6