Merge "Remove spaces at end of line to match existing code"