Import translations. DO NOT MERGE
am: 907cd0546f  -s ours

Change-Id: I6fd4d51f07fb762db5650f690aaa5985b1aa0f9d