Merge "Make utils/create_reference_dumps.py slightly less slower when -l is specified."