Merge "Removing the settings-based IncidentReportArgs method." into pi-dev
am: 46c0e91b74

Change-Id: I19be9d6a6c3b1674dada4eaaf36faf2e555a8b79