Merge "Remove CheckBattery altogether" am: 2890b8d215  -s ours am: 90a9c44f9d
am: 68b565336b

Change-Id: I88aa538f2bfb210ce185784ee2c95b70080718e4