Merge "Remove unused lambda captures" am: 1101f45613 am: c7ce115073
am: ca9988f0f9

Change-Id: Id1259cbbf1bbe9032d66315a346fa4d5d27ce2b3