Changes for kitkat

Change-Id: Iac2a357056cb4a09faf78385b879eb37608d7dd9