Rest of the AOSPA's battery changes... thanks to the commits authors