Merge "Handle EOF explicitly in incident_helper" into rvc-dev am: 755ce9edf9 am: 73c4afa4c9

Change-Id: I974ea9408c59ba53b7d515ac5f42f41b688c910b