merge with AOKP

Change-Id: I96ec0742bf8ed8e04ee3714d0e8cba465fb03f1f