Merge "CCSDK-1559-making two final fields as static too"