Merge "Format Japanese numbers using national format when in Japan."
am: 050e5ddb4f

Change-Id: I996a79c2b3158e1fd6999330e0b0b21f8e4c8b4b