AOKP to DU changes

Change-Id: I030a837ef7b1ccd4051523bfbf327b66accfea22