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

Change-Id: I3d9ffaa6f13a1d2859c6d591dfcb1c573c7cd11e