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

Change-Id: Ieae2c79f05d698807b2e8936bdf30002c1f5423f