Merge "Remove trailing spaces and tabs"