Merge "Fix calculation of power drain from BT and WiFi" into mnc-dev