Merge "Rename NONE to UNSPECIFIED for EntrySeverityLevel." into tm-dev