merge with AOKP

Change-Id: Ib42533e81ccf99ccd0fbbb0ab6dc8b193c7b41d8