Import translations. DO NOT MERGE
am: 4ddf46c232  -s ours

Change-Id: Ia3182da1007542433e4a325154150b31499e7c7a