am b38b3ed1: (-s ours) am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev

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