This reverts commit 79d079ea49.
Reason for revert: DroidMonitor: Potential culprit for Bug b/196456395 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: I6130e75ae174f68ddfaa6e1010d7979538311020