Merge "Removed unneeded spaces and colons in @param and friends"