Revert "Revert "Kitkat revision 2""

This reverts commit d3a3aa03f08bfe43faadfe8e5404cbdcf18c3ce5.

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