Revert "DO NOT MERGE Split some device nodes out from device."

This reverts commit 69fbbdd54b04e648b07cdf522760247f3dafd362.
4 files changed