Merge "Update the device node to check for MDM systems"