Merge "Fix cert-dcl16-c warnings"