More kitkat changes

Change-Id: Ia244d3ef4ff0de318d722037e7536fefdead0586