am a457ef41: Merge change 21988 into donut

Merge commit 'a457ef41e82b67a31a06f6ffb602cd39c43a1018' into eclair

* commit 'a457ef41e82b67a31a06f6ffb602cd39c43a1018':
  Add OS version to ping service (win/mac only)