Import translations. DO NOT MERGE
am: d2671e488d  -s ours

Change-Id: I0b6000ab626e0aba864bb9b5ec182c338fba6de3