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: I9d5eb13c5f19f348efa98fab9cbad7e6db7a5d41