Merge commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4' * commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4': Fix issue #3113424: Battery stats don't reset on Crespo
Merge commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4' * commit '153bf6c8d7579abca63909424a8602a0f3b8bcd4': Fix issue #3113424: Battery stats don't reset on Crespo