Merge "Fix cert-dcl16-c clang-tidy warnings"
am: 48d500c9e3

Change-Id: Ic61aaa453b1829f1f1da38958767597e27bb4873