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

Change-Id: I80cb79a209cab82f623ffc9b265be77ced5f4088