Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
am: 5eddc4bde9

Change-Id: Ia2aee9b0d3ce92b1ceece65d081389a3386c88e7