am ae7fb488: (-s ours) am 04a536af: Merge "Import revised translations.  DO NOT MERGE" into honeycomb

* commit 'ae7fb4887394615b58c4e97fc5b1ad2e04441903':
  Import revised translations.  DO NOT MERGE