Merge "Revert "Porting AppSearch jetpack upstream changes to platform""