Revert "PIE: Improve assistant handling" to fix google search fc
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy-staging