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

* commit '5a29bdbc49f92588162b0fcfbfd480beaecb5e60':
  Disable two tests that require IPv6.