am c27646cd: (-s ours) am 69b4e411: Merge "Import translations. DO NOT MERGE" into jb-dev

* commit 'c27646cd2705786b33e23edd7f3902e40afecab8':
  Import translations. DO NOT MERGE