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

Change-Id: I63a8ef4992b0439f25f60fb3a700b08cd611fb08