Merge "Add deprecated tag and note StrictMode violation"