diff --git a/neutron/policy.py b/neutron/policy.py
index 7951fe3d4e8..6dcae218b86 100644
--- a/neutron/policy.py
+++ b/neutron/policy.py
@@ -87,7 +87,7 @@ def set_rules(policies, overwrite=True):
 
 def _is_attribute_explicitly_set(attribute_name, resource, target, action):
     """Verify that an attribute is present and is explicitly set."""
-    if 'update' in action:
+    if target.get(const.ATTRIBUTES_TO_UPDATE):
         # In the case of update, the function should not pay attention to a
         # default value of an attribute, but check whether it was explicitly
         # marked as being updated instead.
diff --git a/neutron/tests/unit/test_policy.py b/neutron/tests/unit/test_policy.py
index 7534c42993b..1baac228170 100644
--- a/neutron/tests/unit/test_policy.py
+++ b/neutron/tests/unit/test_policy.py
@@ -431,6 +431,12 @@ class NeutronPolicyTestCase(base.BaseTestCase):
         result = policy._build_match_rule(action, target, None)
         self.assertEqual("rule:" + action, str(result))
 
+    def test_build_match_rule_normal_pluralized_when_update(self):
+        action = "update_" + FAKE_RESOURCE_NAME
+        target = {}
+        result = policy._build_match_rule(action, target, None)
+        self.assertEqual("rule:" + action, str(result))
+
     def test_enforce_subattribute(self):
         action = "create_" + FAKE_RESOURCE_NAME
         target = {'tenant_id': 'fake', 'attr': {'sub_attr_1': 'x'}}