Merge "Fix buildbot failure for 098-ddmc test"