Merge "Fixing wrong Japanese phone formatter."