am 82afa6e6: Merge "Fix IPv6 on wifi"

* commit '82afa6e61e6e8df57b71096a9f07eda956442fec':
  Fix IPv6 on wifi