Merge "Add ability to disable data warning." into nyc-mr1-dev