Merge "NONRTRIC Dmaapadapter config correction"