am 13d7d568: (-s ours) am 23bff513: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '13d7d5684ee855b2e87160dee8a8754d58f5ee72':
  Import translations. DO NOT MERGE