Merge "Replace broadcast with adding a method in BugreportCallback"