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

Change-Id: I525e6673cb1747bd13e60819e1a8d921cd81aea8