Update formatting of includes/upload/

Change-Id: I8cf59cd3bb6dd8de2ed6509b7bc2ef9ff7c5caf1
Merge "Update formatting of includes/upload/"