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

Change-Id: Ied615fbaf689a931a2b93785d944f2a8bd7f49dd