Bring inline with AOKP