Revert submission 27057737

Reason for revert: Droid-monitor created revert due to breakages in b/339822929. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:27057737

Change-Id: I6563fdc760e86b10bf48af3e8f02100b1c3591df