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

Change-Id: I4aa72d8fef707097a7114698d9ccd8345c568d13