Couple of AOKP commits