Merge "Revert "Wifi usability: Change the unit of the threshold for tx/rx throughput from Mbps to Kbps"" into qt-qpr1-dev
am: 9c1464d7ca

Change-Id: If7613b0b002a3462de5475e000a23b711d2ab5b1