am 650f5b91: (-s ours) am 98aa668a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '650f5b91dc8bf30860c55c7ad6d04e73feed0d2a':
  Import translations. DO NOT MERGE