Merge "fix(cc): code coverage optimization fix" into integration