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

Change-Id: Ic85d382111f5d2d5c80f55d71b477a2083a394d4