Merge "fixing i18n bug. b/15711200"