Import translations. DO NOT MERGE am: a4fc2d94ae  -s ours
am: cb6592a052  -s ours

* commit 'cb6592a052c7c36e5a6adeda156cbd5195b9032e':

Change-Id: Ie8bf1e61d60919d88346664af5d6174b1780d275