Merge "Clean up code in BugreportProgressService" into rvc-dev am: 78ef10aa72

Change-Id: Ie0dab585496286f7b632aff4438d267b342b0034