Merge "Ensure the correctness of fast verify"
am: 9b596c0a1e

Change-Id: I8070caa85581e07f9ac0917088badc95e7558ca1