Make sure bean field validators are only added once (#11045)

Change-Id: I67779fa5bfd4c850101c11c22091c988eb65b808