(bug 45614) Fix incompatibility with recent Validator

Change-Id: Ia4e0095c6063b4278f45b5139bed905e422c6b8b
Merge "(bug 45614) Fix incompatibility with recent Validator"