Merge "Use readUniqueFileDescriptor in incidentd service" into sc-dev