Merge "Disable two tests that require IPv6." am: fbcafbc816 am: 5a29bdbc49
am: 54c424c0f8

* commit '54c424c0f8e73ba038b1089c3d55f415f7d88d94':
  Disable two tests that require IPv6.