Import translations. DO NOT MERGE am: 08838a1c53  -s ours am: 9bf58c1e51  -s ours
am: b3062cb480  -s ours

* commit 'b3062cb48026c9723c24e5fa4a634a52bfcfe523':

Change-Id: Idffc546af2382e2f50f8ab18640c5300ec07a43e