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

Change-Id: I4908e729ac94a787379adf5bf6e578fd82222b93