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