OS description support for Windows

(cherry picked from commit a3702702638b0ce4cfe0118133902d4445c9516f)