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

Change-Id: I2bb33876a9318cc347600726e9277cf71db9c75d