Breaks jdwp test on device. This reverts commit 35710a02. Change-Id: Ib693e8588eef297495c1d55e4f55cd2ec8ef2bf3