Import translations. DO NOT MERGE
am: 4fd35e0578  -s ours

Change-Id: Ic02d9837575237d253b2dd9693f8b7c27f1238ac