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

Change-Id: I766decd0d68c9a2cb47d374c9a48c8eac59a6a67