Using validator reset

Change-Id: I6363ed27d7d6a4699cc07f283741016f89870bbf