Import translations. DO NOT MERGE
am: 4cdc225ade  -s ours

Change-Id: I19e9a573b95d129f436cbd39fa9f2c5cc2caf5e3