Revert submission 27007604-pps_topic Reason for revert: Droid-monitor created revert due to breakages in b/338407263. Will be verifying through ABTD before submission. Reverted changes: /q/submissionid:27007604-pps_topic Change-Id: Icf89f2bd526634daa8ba10f80471b80dab0837f7