Merge "Fix failing tests in BugreportManagerServiceImplTest" into main