Merge "Do not create EMPTY batterystats history file." into qt-dev
am: 04c3eeeaa0

Change-Id: Ia44b9ec9ecc9d4b17ed689b339410a0f535dcc5b