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

Change-Id: I0228c7cc17ed6aec7c6414e8036ea757bac64a00