Merge "Optimize incidentd memory usage" into pi-dev
am: 12fa6b4ff6

Change-Id: I6ccbb8675002c93c3894220d12597d6fc4c63153