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

Change-Id: I2f835df208a60eee28232406eb321064078075a5