Convert to use MD-SAL APIs