Merge "Update formatting of includes/upload/"