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

Change-Id: I1aa595256c6426730d7cd1123a579fd823536e26