Merge "Redefine core-lambda-stubs module definition"