Merge "Fixed BugreportReceiverTest failures:"