Merge "Clean dirty state after uploading to server" into nyc-mr1-dev am: 0b73fd8f90 am: 4cd6724379
am: 5b127bc2e2

Change-Id: I4660f139667fef5cd164b5756d01abd9d3b8dbc5