Merge "Cleaned up dependency to data saver mode." into nyc-dev