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

Change-Id: Id249d36d6f6c3be45c9d426365ce69e85a05269b