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

Change-Id: Ib061a82c6866f7eedf532108a8d7a848e8ff0a9e