[v6r7] Back port fix from r8 wrt proxy-info showing an error when there's no CS

FIX: Back port fix from r8 wrt proxy-info showing an error when there's no CS