Merge "Clean up bugreport API."
am: 2e44838064

Change-Id: Ib21ecea8a3dc63808784aba20f018ddd012c03c8