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

Change-Id: I89b454cb984e22eaf603477f6b6c527e135a199c