Merge "Revert "Workaround for Clang emitting spurious Wunused-lambda-capture warning"" am: 61a7b9f0fe
am: 15b0a63b27

Change-Id: I9292894d1b10914f0ad92bc958a358f39ca65afb