p^k-torsion of genus two curves over F_{p^m}

We determine the isogeny classes of abelian surfaces over F_q whose group of F_q-rational points has order divisible by q^2. We also solve the same problem for Jacobians of genus-2 curves.