This reverts commit 6b77db73. Reason for revert: DroidMonitor-triggered revert due to bug b/270577207 Change-Id: Iee71ae4a05ede86ee8496ab8d8b88a4107381d2b