Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken * commit '733a2f654934d452b2febf6f80cd1136830758d5': Fix a crash in BatteryStatsImpl, due to a previous fix.
Merge commit '733a2f654934d452b2febf6f80cd1136830758d5' into kraken * commit '733a2f654934d452b2febf6f80cd1136830758d5': Fix a crash in BatteryStatsImpl, due to a previous fix.