more kitkat changes

Change-Id: I17ddba8e947d9031a7417034669ed805160bc005