Importing latest changes from mozilla-aurora for Japanese