ancora: Battery changes from 3.0 branch

* Forgot to port these over