Merge "Add NOLINT to suppress clang-tidy warnings."
am: 32d08d8d74

Change-Id: I365e2ee25bcb61c8b8344557448efbdc8a9b1b32