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

Change-Id: Ia9e3f94b367dffc6482f5f3ba12aeaba2eed6874