Add test for OverrideValidatorImpl am: 1828d218d6 am: 261d85b7ce

Change-Id: I85702ddaa1c801e8078a6e25d2457af264e778ed