This reverts commit 90264e56. Reason for revert: Test monitor is here; see b/178404956 Change-Id: I473ae1562c5d4bb90b755edaba8a8463f55b7fb4