Merge "This cl tries to fix cts tests IncidentdTest" into pi-dev