Merge "Make compliancetest use old mockmodem library" into main