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

Change-Id: If18910dba402d98ffc115af8c87b836fca50ec0f