Fix based on aosp source