Merge "Fix cert-dcl16-c clang-tidy warnings." am: d8199a618c
am: 95bc2c6f58

Change-Id: I88a40aafa65544f83bc85ed1ae4b1496d0cc25e5