This reverts commit 8b95a12489. Reason for revert: DroidMonitor: Test failure Change-Id: I09230ea7c3b80e1b4d277d3c6c6355a38f7bbc92
8b95a12489