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

Change-Id: I6033a4cb4cdfe21f04ced289ce17e7b3bc734c65