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

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