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

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