Update commits from kitkat-staging branch