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

Original change: undetermined

Change-Id: I8f07781b0dc4658c4779439a6c8718d6cf458a45