Merge "Fix spaces in doc comments"