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

Change-Id: I0b5832054d98c3d58d887b5227ab58af75f92684