Changes to fit AOSP standards