Merge "incidentd: Adding privacy tag and expanding field."