Merge "Follow API guidelines in BugreportManager" am: 37aee80c76 am: 0dcbf78430
am: 99d137b32a

Change-Id: Ibb61ae2f4f633744229b4b619205f396d2c3f8a8