am 60951a10: (-s ours) am 69e1dda0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '60951a107e24712b3132e1b85bca503b8f2ecb11':
  Import translations. DO NOT MERGE