This reverts commit 1ca6f8ddb8.
Reason for revert: DroidMonitor: Potential culprit for Bug 231171562 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Change-Id: Ib5819de2ce4e60deae5676eed9947cbbb759be10