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

Change-Id: Iafe660d4617670de3b5d32121e19231534dab615