Merge "Emit fingerprints during OTA upgrades." into oc-dev
am: 19627d678b

Change-Id: I3a545f11f50716b23e3d110950afee179aecf7fa