Merge "CCSDK-1559 -Rename this local variable to match the regular expression '^...