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

Change-Id: I9471a1ba168a218477f5188467406a14ed0615aa