Merge "Fix cts tests for incidentd." into pi-dev