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

Change-Id: I7ff3e93610855ce6382ed64cc722ffae34d39ded