am bb50b0b4: am f1ddfd1e: Keep tests building.

* commit 'bb50b0b4f3f7b738317cf905c7ef6274e89828c7':
  Keep tests building.