Merge "Refactor bugreport files creation and getfd methods"