Import translations. DO NOT MERGE
am: 47a4e0a018  -s ours

Change-Id: Ic6f6f6cb2e35abf18906715870412b8d2fbfb2a2