Merge "Wifi Tx/Rx rate computation" am: bccf93311c am: 33600a3d38
am: e929425a9e

Change-Id: Ia38e00d785c56c295007aa19f3fe1e70d6a8b494