am f2eb6fbc: am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev

* commit 'f2eb6fbc0a9d000a2037d69e381c0784ccb847af':
  Use the old interface when resetting connections