Merge "[RESTRICT AUTOMERGE] STS retry issue: Clean up fingerprint handling to avoid checksum invalidation. Basically, we need the original device fingerprint when ensuring we have an eligible device fingerprint and the masked fingerprint when checksumming results." into oc-dev
am: c20752cebb

Change-Id: I7b5314dfb58f6e4b9ab5c9866d28e4a58845328f