am 4e3d6aa0: am d284a867: (-s ours) Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit '4e3d6aa0688f023dfe5feb2eb197207cc8267463':
  Import revised translations.  DO NOT MERGE