Revert "Kitkat revision 2"

This reverts commit 96dcf762980c192b3ea8132be7180e389a2341f3.

Change-Id: I4ddd50305e9995b76920d579cd17ad919dc02188
Merge "Revert "Kitkat revision 2"" into jaf-1.1