Backed out changeset a69926fdcbd9 (bug 1046127) for removing the wrong line.
Bug 1046127 - Don't drop adb connection during startup. r=fabrice, a=bajaj