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

Change-Id: Id2f6c4658c1660e9aec1c47633ad25cb7f7c9a60