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

Change-Id: I49a597db2460266e920a30d049304c8685f4dba7