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