Merge "Porting AppSearch jetpack upstream changes to platform"