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