Merge "Fix bugreport logs by setting 'extra_options' field"