Merge "Silence bogus unused-lambda-capture warning" am: 1aafb843c8 am: 0a9126f2ae
am: 6df7cc5d05

Change-Id: Ia49f793fd53ccf97d085149a5f144c572c33454f