am 868805ae: Merge "Change which backdoor the tests goes through"

* commit '868805aec49ec1ee5e60e787c23e838ed9f55fb3':
  Change which backdoor the tests goes through