Fix build, put back 'this' capture am: 15ec48374b
am: b37a40891c

Change-Id: I0d7dce794e1dd8cf0a6543e5e1d5573d51c42112