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