Import translations. DO NOT MERGE am: 52ae3289fb  -s ours
am: b344ba69e6  -s ours

Change-Id: I55feaa7bef40a53abc0493199cce24e8e66106ab