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

Change-Id: I6116b292973d06e16a49f6ca78035d421b5588cd