Merge "Clean up code in BugreportProgressService" into rvc-dev am: 78ef10aa am: bf7239c1 am: 540b2e24 Change-Id: I6e47d5d41f5ac00da6cdb898b045cd7c5152ef6a