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

Change-Id: I359f1bc3dd4daf38f24efec5c1083dbdc338c666