Import translations. DO NOT MERGE
am: 970e4d9d90  -s ours

Change-Id: Iec4e50f1eceda70a0547a9c09c5e0d9885b2aa3e