Import translations. DO NOT MERGE am: ffe930ec76  -s ours am: 21b7e430e0  -s ours
am: 6e9d64ba33  -s ours

* commit '6e9d64ba334555f0b83cf400fb0e8ac6dff9e1e8':

Change-Id: Iba0d03b9f2a8237e7fd8c7b529b67de2fa67aad5