Merge "Fix unused DT entry warnings."