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

Change-Id: I407b07b66f358474c9493aa8f5950e5b03fd2d1a