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

Change-Id: I2664d2de3d1ad770faa9681275c030f976c90a21