Merge "Fix data usage format strings" into nyc-dev