Merge "Fix a bug in diagnostic_injector.py where the wrong file list was being looked at"