Merge "fix wrong algorithm in WifiPowerPerPacket()" am: 16e1007481
am: b2eb8ea894

Change-Id: I5ace39e2b6b679622f9c2ab27831a1e079541e32