This reverts commit 55648268. Reason for revert: DroidMonitor revert Change-Id: Idd86b0ceb18fc425c39fe3c75603a472568eabe1