Merge "utils: Remove trailing whitespace"