Merge "Don't crash on non-app data usage" into nyc-dev