Merge "Revert "Display and parse numbers properly in all locales"" into oc-dev am: 30e9474dbb
am: 87603385b7

Change-Id: I64197acec6cb6cc055b496198b01c954c4c1907f