Merge "Remove unnecessary code for new BugreportManager"