Merge "Replace deprecated os_adm"