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

Change-Id: Iad844a9f84d59d8bb3bd2690acc8261a2a2cb4cc