Merge "fix check_target_files_signatures" into honeycomb