Bring inline with aokp