Synchronize PlatformInfo with master version
Basically a backport of !4317 (merged), but also including other minor changes to keep the two versions of the files identical.
Basically a backport of !4317 (merged), but also including other minor changes to keep the two versions of the files identical.