This reverts commit 1fa2672b. Reason for revert: breaks tradefed branch Change-Id: I69bba531774031890baece1796df24d5534b93a9