Merge remote-tracking branch 'pa_upstream/kitkat' into legacy
Merge remote-tracking branch 'legacy/kitkat' into kitkat