am d8a98cf0: (-s ours) am c724f2fb: disable the bypass mode. DO NOT MERGE.

* commit 'd8a98cf0a30dbb95ea2fcc8dfe2fe37d670d243e':
  disable the bypass mode. DO NOT MERGE.