Merge "Enable BugreportStorageProvider when bug report is enabled"