Prefer anonymous functions

Change-Id: I7aacd5d0a2a21c35fd2a1ef2d3b7d01e17b5f5e6
Merge "Prefer anonymous functions"