Merge "Updated validation tool code from g3 Import generated by Copybara."
am: 7cfd4883b4

Change-Id: I3ce8d7c9794ed007e8fcaeb5f18f9a41cf646bb5