This reverts commit 0b1ebd7c. Reason for revert: DroidMonitor: b/279841572 Change-Id: Ieab5c60d55f47fa862aba4b3a9f4f4dce759bbab