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

Change-Id: Ie6d021923c2fe396d954b4df07eb293a9cf3dd6d