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

Change-Id: Iaadf3428ceec1591f7d05f6a893cdf76d2e9ee89