Import translations. DO NOT MERGE am: 7158c89582  -s ours
am: f794c86972  -s ours

Change-Id: Iabbbe8b6ce4d249bb8457e9b90cf6683949b0c35