We could generate that in the number formatter, but as long as we don't ...

Change-Id: Icbbad4215fdf7f3a94f652c27cb2f9b04205b519
(cherry picked from commit f672c8cc)