Merge "Compare the fingerprint before reading the partition"
am: 81da8b12d2

Change-Id: I8a62d55b974ecfb0a3715459ed10e2c9fd6a2c75