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

Change-Id: Ia9927f3f094767ea136a06b0a840e89f280d26c2