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

Change-Id: Ic89ec00cbf94ca3da131d4aff3bc9df04fc1b4be