merge with AOKP

Change-Id: I7706354abddf77042756a4c5d7c81ccdc48dbb00