Merge "Display and parse numbers properly in all locales" into oc-dev
am: 28e5271c61

Change-Id: I209c67664d3713609cdc10bde9598f796b167139