Import translations. DO NOT MERGE
am: 98986c0316  -s ours

Change-Id: I3a2fd7bad00b379313aa5ca7f222b32a4f25f509