Inline with Cyanogenmod Chris commits.Thanks @chrmhoffmann