Merge "make it more generic : devman, device-node"