Merge "Replace dts includes with C preprocessor syntax" into integration