Merge "Clean up bugreport API."