Merge "Remove user-triggered disconnect counters" am: 2007ee8de3
am: b8d3324bb7

Change-Id: Iaf564f5428e3d91773bb0bd6743340f55dd192db