Merge "lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews." am: f33ea7911d
am: a18f1ae906

* commit 'a18f1ae9063e17d59b536a70a805e7a761462025':
  lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews.