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

Change-Id: I5b120c2d816f8ba20ad443c9dbbdf5797e85923a