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

Change-Id: Ie2d0a341db570e2fb807da3b8ff7a049c055c49f