Merge \"Merge \\\"Use existing localizations for formatting data usage [DO NOT MERGE]\\\" into nyc-dev am: 5eddc4bde9
am: 241f8e6e9c\" into nyc-mr1-dev-plus-aosp
am: c553faaa00
-s ours
Change-Id: I039044e7feb83b709e8d5f6a75302ed640500d70
This commit is contained in: