am aeefa69a: (-s ours) am 8a234809: Merge "Use BaseNetworkObserver in Tethering."

* commit 'aeefa69a882eb1068da3a45cec82e50971c45df2':
  Use BaseNetworkObserver in Tethering.