Update for Moto AOKP