[ros-diffs] [jgardou] 53578: [PSDK] - put NOGDI guard at the right place...