Merge "Fix the broken script in AssertFingerprintOrThumbprint. am: 9c6ab6c49b am: aeb3125ac3 am: d26a4099ac" into oc-dev-plus-aosp
am: a32cf235fd

Change-Id: Icccb9d1189162358937cac05444bdc5f423ca4c1