am fc5e0ba6: am b9f170ff: am b4db7923: Merge "Delete some obsolete test code."

* commit 'fc5e0ba6254d82074d8d4f46dbd5cc580f933ede':
  Delete some obsolete test code.