Import translations. DO NOT MERGE
am: 683fdb8177  -s ours

Change-Id: I6d6c17a868765261ace38e0532c95695c2dfb840