Merge "Fix the broken script in AssertFingerprintOrThumbprint."
am: 9718140570

Change-Id: Iba0a8526407be3f06bab153776ae098379ad653e