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

Change-Id: If55df6c770fdead996c68a3a348f41896c23b062