Merge "Clean up unnecessary imports in 01-md-sal.xml ."