6ffa76077d
Reverting because it seems to break `adb reboot` This reverts commit 813af8d46467f41ed2d492917cbb9f9f45d2a3d7. Change-Id: I75d827664a08799de15369c24c84cc3f49a8f297