Merge "fix(cc-713): fix a build failure with CC-713 library" into integration