Merge "Fix crash issue for VTS setupDataCall_1_6_osAppId" into sc-dev