Merge "Update upstream comparison/snapshotting tools."