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

Change-Id: Icaac74b600e436a0fa696741ba151ac7a8f00d0d