Revert "Revert "Merge remote-tracking branch 'PA/kitkat' into kitkat-staging""

This reverts commit 66d21837c6e2da8965effb71097d159f761a6d1d.