Merge "Filter out ddms error message in 1940 better"