AOKP Updates

Change-Id: I8f1fa9b4b395a43ce1f53d769225904b36099f6d