Avoid use of __METHOD__ in closure.

Change-Id: Ib25063f41cc25647003442cbd5851c3b777b2a7a
Merge "Avoid use of __METHOD__ in closure."