Import translations. DO NOT MERGE am: 958f398e31  -s ours
am: 0851380860  -s ours

* commit '0851380860b24400b7aac5377e69b71dfeea7675':

Change-Id: I7f88fa0eb84804754ffc66791944e9546c539134