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