reverted validation change as its breaking test cases
reverted validation change as its breaking test cases

juliancheal/xclarity_client,lenovo/xclarity_client,lenovo/xclarity_client,juliancheal/xclarity_client