am 2087e296: (-s ours) am a7950f64: am 47417ec1: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '2087e2961d41122360df4e0104c49bbc42c0f118':
  Import translations. DO NOT MERGE