This reverts commit c2817ca1. Reason for revert: DroidMonitor-triggered revert due to bug b/222503182. Change-Id: I8ab687811b7b0a76587bcb0903055ebbc35f729a