The latter seems to be roughly true.I think MS did specify they are 512/1024 systems which means this makes the most sense. Also we know that PS OS should be dramatically smaller as is standard.
The former I don't think is. But it's hard to say. Manufacturers very often will use GB to mean GiB.
If you hadn't noticed, this is Forum 2.0