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

Change-Id: I9869be98a5c4668b935a4f50a5636b8ea1b9392c