Merge "Update Ubuntu18.04 builder node"