Merge "Remove whitespace not present in upstream source"