Merge "Fix a few clang-tidy issues and add NOLINT for others" am: 343ce615cf
am: a61745dea7

Change-Id: I055890ab801a402cd6e8f84931de5e2b7abe22e0