Merge "Fix cert-dcl16-c clang-tidy warnings" am: 48d500c9e3
am: 71062f3f98

Change-Id: I3e3c68912ea7dfa52664228b2636a74313fb2442