Merge "DO NOT MERGE Split some device nodes out from device." into jb-mr2-dev