diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index 578fabf..f059bf9 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -1077,8 +1077,6 @@
   }
 ----
 
-----
-
 [[set-message]]
 === Set Commit Message
 --
diff --git a/resources/com/google/gerrit/server/mail/ChangeFooter.soy b/resources/com/google/gerrit/server/mail/ChangeFooter.soy
index c5b9e4a..2910537 100644
--- a/resources/com/google/gerrit/server/mail/ChangeFooter.soy
+++ b/resources/com/google/gerrit/server/mail/ChangeFooter.soy
@@ -34,7 +34,7 @@
     visit {$email.settingsUrl}{\n}
   {/if}
 
-  {if $email.changeUrl or $email.settingsUrl}
+  {if $email.changeUrl || $email.settingsUrl}
     {\n}
   {/if}
 {/template}
diff --git a/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy b/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy
index 5a22acb..62358ee 100644
--- a/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy
+++ b/resources/com/google/gerrit/server/mail/ChangeFooterHtml.soy
@@ -19,13 +19,13 @@
 {template ChangeFooterHtml}
   {@param change: ?}
   {@param email: ?}
-  {if $email.changeUrl or $email.settingsUrl}
+  {if $email.changeUrl || $email.settingsUrl}
     <p>
       {if $email.changeUrl}
         To view, visit{sp}
         <a href="{$email.changeUrl}">change {$change.changeNumber}</a>.
       {/if}
-      {if $email.changeUrl and $email.settingsUrl}{sp}{/if}
+      {if $email.changeUrl && $email.settingsUrl}{sp}{/if}
       {if $email.settingsUrl}
         To unsubscribe, or for help writing mail filters,{sp}
         visit <a href="{$email.settingsUrl}">settings</a>.
diff --git a/resources/com/google/gerrit/server/mail/ChangeHeader.soy b/resources/com/google/gerrit/server/mail/ChangeHeader.soy
index 708d046..cf1eb93 100644
--- a/resources/com/google/gerrit/server/mail/ChangeHeader.soy
+++ b/resources/com/google/gerrit/server/mail/ChangeHeader.soy
@@ -18,7 +18,7 @@
 
 {template ChangeHeader kind="text"}
   {@param? attentionSet: list<string>|null}
-  {if $attentionSet and length($attentionSet) > 0}
+  {if $attentionSet && length($attentionSet) > 0}
     Attention is currently required from:{sp}
     {for $attentionSetUser, $index in $attentionSet}
       {$attentionSetUser}
diff --git a/resources/com/google/gerrit/server/mail/ChangeHeaderHtml.soy b/resources/com/google/gerrit/server/mail/ChangeHeaderHtml.soy
index d687ce9..4b6a158 100644
--- a/resources/com/google/gerrit/server/mail/ChangeHeaderHtml.soy
+++ b/resources/com/google/gerrit/server/mail/ChangeHeaderHtml.soy
@@ -19,7 +19,7 @@
 
 {template ChangeHeaderHtml}
   {@param? attentionSet: list<string>|null}
-  {if $attentionSet and length($attentionSet) > 0}
+  {if $attentionSet && length($attentionSet) > 0}
     <p> Attention is currently required from:{sp}
     {for $attentionSetUser, $index in $attentionSet}
       {$attentionSetUser}
diff --git a/resources/com/google/gerrit/server/mail/NewChange.soy b/resources/com/google/gerrit/server/mail/NewChange.soy
index c5f34b4..7e2af28 100644
--- a/resources/com/google/gerrit/server/mail/NewChange.soy
+++ b/resources/com/google/gerrit/server/mail/NewChange.soy
@@ -27,7 +27,7 @@
   {@param ownerName: ?}
   {@param patchSet: ?}
   {@param projectName: ?}
-  {if $email.reviewerNames or $email.removedReviewerNames}
+  {if $email.reviewerNames || $email.removedReviewerNames}
    {if $email.reviewerNames}
       Hello{sp}
       {for $reviewerName, $index in $email.reviewerNames}
diff --git a/resources/com/google/gerrit/server/mail/NewChangeHtml.soy b/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
index 008226f..fac3c3d 100644
--- a/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
+++ b/resources/com/google/gerrit/server/mail/NewChangeHtml.soy
@@ -26,7 +26,7 @@
   {@param patchSet: ?}
   {@param projectName: ?}
   <p>
-    {if $email.reviewerNames or $email.removedReviewerNames}
+    {if $email.reviewerNames || $email.removedReviewerNames}
       {if $email.reviewerNames}
         {$fromName} would like{sp}
         {for $reviewerName, $index in $email.reviewerNames}
diff --git a/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy b/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy
index 6ae8625..9b9d1ad 100644
--- a/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy
+++ b/resources/com/google/gerrit/server/mail/ReplacePatchSet.soy
@@ -30,7 +30,7 @@
   {@param unsatisfiedSubmitRequirements: ?}
   {@param oldSubmitRequirements: ?}
   {@param newSubmitRequirements: ?}
-  {if $email.reviewerNames and $fromEmail == $change.ownerEmail}
+  {if $email.reviewerNames && $fromEmail == $change.ownerEmail}
     Hello{sp}
     {for $reviewerName in $email.reviewerNames}
       {$reviewerName},{sp}
@@ -53,7 +53,7 @@
     {/if}.
     {if $email.changeUrl} ( {$email.changeUrl} ){/if}
   {/if}{\n}
-  {if $email.outdatedApprovals and length($email.outdatedApprovals) > 0}
+  {if $email.outdatedApprovals && length($email.outdatedApprovals) > 0}
     {\n}
     The following approvals got outdated and were removed:{\n}
     {for $outdatedApproval, $index in $email.outdatedApprovals}
diff --git a/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy b/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
index 1d99591..30a5dbf 100644
--- a/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
+++ b/resources/com/google/gerrit/server/mail/ReplacePatchSetHtml.soy
@@ -44,7 +44,7 @@
     </p>
   {/if}
 
-  {if $email.outdatedApprovals and length($email.outdatedApprovals) > 0}
+  {if $email.outdatedApprovals && length($email.outdatedApprovals) > 0}
     <p>
       The following approvals got outdated and were removed:{\n}
       {for $outdatedApproval, $index in $email.outdatedApprovals}