Merge remote-tracking branch 'origin/kitkat' into kk-upstream