Merge "Fix failed unit tests for CSDK stack."