Merge "Fix cert-dcl16-c clang-tidy warnings." am: d5cdd6d7b3 am: 90b6da972d
am: 34f32df7a6

Change-Id: I5467384a73052482c65839b60459d7a81ab6bf72