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

Change-Id: If8192c5b9976c7139d145da168bcb20ce1fc835c