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

Change-Id: Ib8155edff17903fa6bf775c6809498f032ea611d