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

Change-Id: I340c84a26e8c929836bd461dbc0d18cd1bca5068