Merge "Adjust monkey code to new internal API"