Relax validation checks

Change-Id: Ic7af85d821d818ddba14e9115565cf2f0af0dc31