Kitkat revision 2

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