am dfb5f9ce: Merge "Re-add location check for FindDexCache"

* commit 'dfb5f9ceb277f30ee961b27e72d968e0695611a6':
  Re-add location check for FindDexCache