sqashed merge with AOKP

Change-Id: I33d6cfe8774a4b01f02180966193b7f7cbb644e5