AOKP to DU change (need system/core commit as well)

Change-Id: Ib503468089d1b95270cb64534462a0120a84804d
Merge "AOKP to DU change (need system/core commit as well)" into jb-mr2