DirtyUnicorns-KitKat to DU-AOSP change

Change-Id: I1a5b7b57c37aecc872b46d857b3465187c281cd5