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

Change-Id: Ic44cadda4d2d1aa5e5e742f4f2c3d92fd04ed6ab