Merge pull request #130 from googlei18n/opensource_update_7504

Opensource update 7504