Merge "Follow StrictMode refactoring."