Import translations. DO NOT MERGE
am: 3b2d98c714  -s ours

Change-Id: I425cc59dacedac1c97d92e700ad1e0e93bd0a089