Merge "Revert "Split getInstance and createInstance in AppSearchImpl""