Merge "Remove trailing spaces in debug log"