Merge "Tweaks to file:// Uri StrictMode checks."