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

Change-Id: I10ae42879d7a4c7001583bfac2f835264c90ff2e