Merge "Allow configurable data warning for BillingCyclerPreference" into nyc-mr1-dev