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

Change-Id: Idaac12b9bbf6ce20152d355715407ddbe408f42e