Merge "api-review: Add Executor and move callback to end of argument list"