Fixed temp dir conflict
Fixed invalid validator

Change-Id: I72d6e00d895a0fb360d3d05da9b44e0e63322869
Merge "Fixed temp dir conflict Fixed invalid validator"