Merge "Fix setupDataCall tests for osAppid"