Merge "Correct ownership of AppSearchPersonTest"