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

Change-Id: Ie54ebb4f61e9c6660772ba53adfd462b9ba18ec0