Replaces empty methods and std::bind calls with lambdas. Change-Id: I0d9c876a9ba0bbdc6a77a85e0e2d75766312f952