Merge "This cl tries to fix cts tests IncidentdTest" into pi-dev am: 72a39eb3be
am: dceecbd1fa

Change-Id: If7909669f4a898583b5c65d1b72a9d6f890e9284