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