Merge "FastPath: Update for clang tidy"