Import translations. DO NOT MERGE am: 58d444ff5f  -s ours
am: e6ff25e165  -s ours

* commit 'e6ff25e165b07ab40d4e01f70c43895c5bc56320':

Change-Id: Ica719f3ae7c899e383d9d24440e8ce13102f7765