Merge pull request #175 from googlei18n/opensource_update_31358

(AUTOMATIC) opensource update