This reverts commit b936f0c5fd. Reason for revert: Droidmonitor created revert due to b/418898788. Will be verifying through ABTD before submission. Fix: 418898788 Change-Id: Ia47f0cc9a33ed33f9d53064878992081a792f1ad
b936f0c5fd