am e3425ac4: (-s ours) am af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

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