Import translations. DO NOT MERGE am: 0671f10b17  -s ours am: 35b47d61f6  -s ours
am: 4af02a1ce0  -s ours

* commit '4af02a1ce0bcadd8ba0d3bb84d08d498da23768a':

Change-Id: Iadf42200bf5d2b54359ea950236c3380cf5c0370