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

Change-Id: I2c117bcd5125e976007ef087f0f63a2cdcba1a03