Merge "Use different detailed message for "data limit reached" failure." into nyc-mr1-dev