This reverts commit a2d4cfba. Reason for revert: TestMonitor: culprit for b/274520461 Change-Id: If4bd03963e7013c784f8f436fd9f7d9bb961a223