Merge "Fix cert-dcl16-c clang-tidy warnings." am: 20b64c4bc7
am: 3038f743bf

Change-Id: I049e4e1ebad45da8bfae34bb0c0ca6f241720b70