Updates to sync with AOKP