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

Change-Id: I7e78e04a5539ffa8a8bf6e31394d0f8c52301c08