Merge branch 'stable-3.11'

* stable-3.11:
  Fix NPE in SyncReviewerManager

Change-Id: Iae674221a0efac3d8e2e0604e0009b425df59991

owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/SyncReviewerManager.java

diff --git a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/SyncReviewerManager.java b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/SyncReviewerManager.java
index e9acc43..5b2ba89 100644
--- a/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/SyncReviewerManager.java
+++ b/owners-autoassign/src/main/java/com/googlesource/gerrit/owners/common/SyncReviewerManager.java
@@ -142,7 +142,7 @@
         in.ignoreAutomaticAttentionSetRules = true;
         if (ownersForAttentionSet != null) {
           in.addToAttentionSet =
-              ownersForAttentionSet.get().addToAttentionSet(changeInfo, reviewersAccounts).stream()
+              reviewersAccounts.stream().addToAttentionSet(changeInfo, reviewersAccounts).stream()
                   .map(
                       (reviewer) ->
                           new AttentionSetInput(