Merge "fix wrong algorithm in WifiPowerPerPacket()" am: 16e1007481 am: b2eb8ea894 am: 731918e769
am: 6ae3c66b92

Change-Id: I947484a629c402bfba65188bc37081471d260c6d