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

Change-Id: I72ba59c7e0a64a4c647f61a8d9a821cd28c43809