Merge "Fix cert-dcl16-c clang-tidy warnings." am: 8ae3ca87fd am: 095ed6f891
am: 065052e3a5

Change-Id: I066c5538835416ab4db5648ea42473ce0d080518