Merge "Re-add location check for FindDexCache"