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

Change-Id: I770af0bba538268797295f59c8675191a6ef41a6