am 5f42ccb5: am fcee9d4a: Merge "Tweak test script while investigating failures."

* commit '5f42ccb5914ab7ea61dd2f890248e2d6de60e6c3':
  Tweak test script while investigating failures.