Merge "NFC: don't reparse device tree"