Merge "Fixes for StrictMode instance count checking." into honeycomb