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

Change-Id: Ie4bb31fc7366d65e92209c31f6721e20c8538e9a