Update to kitkat-staging

Change-Id: I4aaacdff509aca501e23ca714de82b18dec33343