Merge "Make the platform proto naming consistent, Part 1 Change proto names in incident_helper"