Merge "Do not restore source object hash in ImageWriter."
am: b28683f432

Change-Id: I25f7a26ca4940f73e897054999ba1dd10d2ba697