am c4a95d3c: (-s ours) am e5128031: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-now-indigo-rose

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