Merge "fix csit test for portal-sdk"