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

Change-Id: I1ab211b4274b8cf4efcc84bdc52101e058f4d184