Changed offline charging to AOSP-style