Merge "Add more tests for battery checker code" into qt-qpr1-dev
am: 141f9a9c83

Change-Id: I8741bdb299d1b6aa8596d832b85d4452b5ae7c9e