gooftool: Allow skipping TPM owner check in cros_core.

For cros_core device running newer versions, it may be hard to figure
out why TPM is still owned - and it's probably not very important.
Let's make it "best-effort".

BUG=b:78485183
TEST=make test

Change-Id: Iaca426f7e2d3183c5d1d78fee0b5171982ca6d84
Reviewed-on: https://chromium-review.googlesource.com/1051430
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
Tested-by: Hung-Te Lin <hungte@chromium.org>
Trybot-Ready: Hung-Te Lin <hungte@chromium.org>
diff --git a/py/gooftool/gooftool.py b/py/gooftool/gooftool.py
index 3974e30..fdc08e1 100755
--- a/py/gooftool/gooftool.py
+++ b/py/gooftool/gooftool.py
@@ -757,10 +757,10 @@
   VerifySystemTime(options)
   VerifyKeys(options)
   VerifyRootFs(options)
-  VerifyTPM(options)
   if options.cros_core:
-    logging.info('VerifyBranding is skipped for ChromeOS Core device.')
+    logging.info('VerifyTPM and VerifyBranding are skipped for ChromeOS Core device.')
   else:
+    VerifyTPM(options)
     VerifyBranding(options)
   VerifyReleaseChannel(options)
 
diff --git a/sh/prepare_wipe.sh b/sh/prepare_wipe.sh
index 389d55a..1c37c1e 100755
--- a/sh/prepare_wipe.sh
+++ b/sh/prepare_wipe.sh
@@ -66,6 +66,7 @@
   install_message
   install_wipe_tag
   . "$SCRIPT_DIR/enable_release_partition.sh" "$1" || exit 1
+  crossystem clear_tpm_owner_request=1 || true  # Best effort.
   NEED_ROLLBACK=""
   alert "Prepare wipe: Complete."
 }